Changes to v1.2: